optional title and alt label in pagelist

diff --git a/macros/pagelist b/macros/pagelist
index 2971515709fc03210abc3be1386797f6375adb45..08764aabe4d91c4924557557c609f5037d9d489d 100755 (executable)
--- a/macros/pagelist
+++ b/macros/pagelist
@@ -19,12 +19,17 @@
 . "$_EXEC/tools.sh"
 
 tags='' dir='' depth='' glob_system_pages=false
+label='' labeltype='' altlabel='' cnt=0
 
 set -- "$@" --
 while [ $# -gt 0 ]; do case $1 in
   --system) glob_system_pages=true; shift 1;;
   --depth)  depth="$2" shift 2;;
   \#*) tags="${tags}${tags:+ }${1###}"; shift 1;;
+  --h1|--h2|--h3|--h4|--h5|--h6|--label)
+    labeltype="${1#--}" label="$2"; shift 2;;
+  --alt-label)
+    altlabel="$2"; shift 2;;
   --) shift 1; break;;
   *) if [ ! "$dir" ]; then
       dir="$1"
@@ -39,17 +44,31 @@ esac; done
 [ "$*" ] || set -- "*"
 [ "$depth" -ge 0 -o "$depth" -le 0 ] 2>&- || depth=0
 
-printf '<ul class="macro pagelist">\n'
-  for dir in "$@"; do
-    page_glob "$dir" "$depth"
-  done \
-  | sort -u \
-  | while read -r page; do
+for dir in "$@"; do
+  page_glob "$dir" "$depth"
+done \
+| sort -u \
+| {
+  while read -r page; do
     pagedir="$(page_abs "$page")"
-    [ -f "$_DATA/pages/${pagedir}/#page.md" -o \
-      -f "$_EXEC/pages/${pagedir}/#page.md" ] \
-    && acl_read "$pagedir" \
-    && has_tags "$pagedir" $tags \
-    && printf '<li><a href="%s">%s</a></li>' "$(HTML "$page")" "$(HTML "$page")"
+    if [ -f "$_DATA/pages/${pagedir}/#page.md" -o \
+         -f "$_EXEC/pages/${pagedir}/#page.md" ] \
+       && acl_read "$pagedir" \
+       && has_tags "$pagedir" $tags
+    then
+      [ "$cnt" -eq 0 -a "$label" ] \
+      && printf '<%s class="macro pagelist label">%s</%s>' \
+         "$labeltype" "$(HTML "$label")" "$labeltype"
+      [ "$cnt" -eq 0 ] && printf '<ul class="macro pagelist">\n'
+
+      printf '<li><a href="%s">%s</a></li>' "$(HTML "$page")" "$(HTML "$page")"
+      cnt="$((cnt + 1))"
+    fi
   done
-printf '</ul>\n'
+
+  if [ "$cnt" -gt 0 ]; then
+    printf '</ul>\n'
+  elif [ "$altlabel" ]; then
+    printf '<label class="macro pagelist altlabel">%s</label>' "$(HTML "$altlabel")"
+  fi
+}